Extruding the roof highlighted some non-manifold geometry hiding in the rafters ;) To that end I cleaned up the roof and adjusted so that the two roof pieces fit together now. I've decided to let the two roof pieces smash into each other. I believe that will give me more control of the texturing later. I can cover the seam up with a strip of trim.
Here is where I'm at in Maya. I included a shot of the roof wireframe. If you have a critique or feedback to help me improve, I'd love to hear it.